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

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



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