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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: e20c9a5b -s ours am: cf447f63 -s ours am: c5389467 -s ours am: 9bbc7a82 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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