[automerger skipped] Merge "[Ongoing Call] Don't call #getIntent to avoid a security vulnerability." into sc-dev am: cc38b3f619 -s ours am: d10ec10b76 -s ours am: 48a685b1e7 -s ours
am skip reason: Merged-In I7707d01be37582461227edcecf5d559f2019c8a5 with SHA-1 b029b005d8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17104654
Change-Id: Icc410819a619fbabe5bda99cfc2f422bc15976a3
This commit is contained in: