[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am:...

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: b85e257d -s ours am: ea42385b -s ours am: f5bff1cd -s ours

am skip reason: Merged-In I75aab474b2459e47d92078499924cbcbf079f07e with SHA-1 888c3494 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/16279379

Change-Id: I9ae382c89ed5776bb2b2e114b55d61b3d67ecd7d