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

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



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