Bug: 260230274 Test: manual Tag: #security Ignore-AOSP-First: security Merged-In: Id733a472236c005e30ff5c2b56b51d6e10fc9061 Change-Id: Id733a472236c005e30ff5c2b56b51d6e10fc9061