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

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



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