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: 0013746f am: aebfb104

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



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