[automerger skipped] Merge "[Ongoing Call] Don't call #getIntent to avoid a...

[automerger skipped] Merge "[Ongoing Call] Don't call #getIntent to avoid a security vulnerability." into sc-dev am: cc38b3f6 -s ours am: d10ec10b -s ours am: 48a685b1 -s ours

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

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

Change-Id: Ic4da9e0dad8959ec49d0239a36769befdcc891ff