Merge changes from topic "am-720575d9a2f541f0a2aa3e7926da8055" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "[conflict] Resolve StatusHints image exploit across user. am: a853f6ba" into tm-dev am: 8ce3e195 -s ours am: 627e9bf2 -s ours am: 82c9b72a -s ours am: 42a1a6ca -s ours am: 1fc26493 -s ours
  [automerger skipped] [conflict] Resolve StatusHints image exploit across user. am: a853f6ba am: 41042bd0 -s ours am: 3053d395 -s ours am: 7ee8fb5a -s ours am: b80fdd49 -s ours am: d380d3b1 -s ours