Merge "Merge "Make sensitive clipboard text preview show asterisks" into...

Merge "Merge "Make sensitive clipboard text preview show asterisks" into tm-dev am: 76fb10f6 am: 37ce6fa2 am: b33a417e" into tm-qpr-dev-plus-aosp am: 492062e9

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



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