[automerger skipped] Merge "Fix vulnerability that allowed attackers to start...

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: 65b870a2 -s ours am: d32ff467 -s ours am: 50569fde -s ours am: 9bcac584 -s ours am: 357dee67 -s ours am: 4fc601ad -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

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



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