[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e12830 am: eebdc4c3b6 am: 66864c7ac8 am: 43bc68b845 am: 9a24157c26 -s ours am: a54dfa09e3 -s ours am: e20c9a5bf4 -s ours am: cf447f63af -s ours

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

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

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