Merge "Add Extra to mark ClipData items as "sensitive"." into tm-dev am: d4dc4fbf am: 8e4885f1

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



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