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

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



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