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: I6c662a432d4b0669935923ac81fadea27b214012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>