Bug: 260568367
Test: manual
Ignore-AOSP-First: security
Merged-In: I0f35513b9655acaa6fe07d2ba2063c1f11d6465b
Change-Id: I0f35513b9655acaa6fe07d2ba2063c1f11d6465b