[automerger skipped] [automerged blank] [Ongoing Call] Don't call #getIntent to avoid a security vulnerability. 2p: b029b005 2p: e981fd10 am: f6f791c5 -s ours am: 047e989c -s ours

am skip reason: Merged-In I7707d01be37582461227edcecf5d559f2019c8a5 with SHA-1 08d94cba is already in history

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

Change-Id: I3636627048b929d119fb58ad52f2f3e054e8a8ad