Merge "Hide sensitive clipboard content" into tm-dev am: f87bf04a am:...

Merge "Hide sensitive clipboard content" into tm-dev am: f87bf04a am: f912bc18 am: 7fc5edd4 am: 6240dd43

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



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