Merge "Hide sensitive clipboard content" into tm-dev am: f87bf04a am: b314685f am: 2926df11

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



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