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

Merge "Merge "Make sensitive text/image both look the same" into tm-dev am: 22703341 am: 95eba4ab" into tm-d1-dev-plus-aosp am: 8e24958d

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



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