[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: d4717a4d -s ours am: 368857b6 -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: I90249b20016deb7bf744cad0615a2a4551fdd547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>