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

Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c

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



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