Merge "[automerger skipped] Merge "Resolve StatusHints image exploit across...

Merge "[automerger skipped] Merge "Resolve StatusHints image exploit across user." into rvc-dev am: 543e6feb am: 8c3d465b am: da5c254e am: 1a48c2ff -s ours am: fb2016a8 -s ours am: 6635847b -s ours am: c14fae86 -s ours am: 14dedcc0 -s ours am: ebe14ec7 -s ours am: a1c2325e -s ours" into udc-qpr-dev-plus-aosp