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

Merge "Hide sensitive clipboard content" into tm-dev am: f87bf04a am: f912bc18 am: 80567740 am: 8f492ef1

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



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