Bug: 256165737
Test: manual
Tag: #security
Ignore-AOSP-First: security
Merged-In: I0a626bbc1a72c8bc9740d139b54726b188b6f1df
Change-Id: I0a626bbc1a72c8bc9740d139b54726b188b6f1df