Merge "Make sensitive clipboard text preview show asterisks" into tm-dev am:...

Merge "Make sensitive clipboard text preview show asterisks" into tm-dev am: 76fb10f6 am: 37ce6fa2 am: 3f239c02

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



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