[automerger skipped] Merge "[Ongoing Call] Don't call #getIntent to avoid a security vulnerability." into sc-v2-dev-plus-aosp am: 14ffe56c -s ours am: fe74cab8 -s ours am: e737e304 -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/+/17108009

Change-Id: I2791aed5e04a86b164172581f9469a1371b27485