Merge "Merge "Make sensitive text/image both look the same" into tm-dev am:...

Merge "Merge "Make sensitive text/image both look the same" into tm-dev am: 22703341 am: 95eba4ab" into tm-d1-dev-plus-aosp am: 8e24958d am: 8d3d1e40

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18414113



Change-Id: If8ef511af07f1b1c6ea0288e6388eba663ef527d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>