Merge "Fix vulnerability that allowed attackers to start arbitary activities"...

Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3

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



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