Bug: 245915315
Test: manual
Tag: #security
Ignore-AOSP-First: security
Merged-In: I4b08db42bed52bb250098a7744b689a5d0c105b2
Change-Id: I4b08db42bed52bb250098a7744b689a5d0c105b2