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

Merge "Make sensitive text/image both look the same" into tm-dev am: 22703341 am: 76e43fa2 am: 089ebd5d am: 4881bb51

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



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