[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: cbb96fc7 -s ours am: 413ed164 -s ours

am skip reason: Merged-In I1e122c64450d5b504cfaa93197439182c21e0956 with SHA-1 be7a1fef is already in history

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

Change-Id: I672d82529c9cee988e3250d8894a0b84fc1c89cf