Bug: 258652631 Test: manual Ignore-AOSP-First: security Merged-In: Ifffa2c7f679c4ef72dbdb6b1f3378ca506680084 Change-Id: Ifffa2c7f679c4ef72dbdb6b1f3378ca506680084