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

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 2d1d1af2 -s ours am: 644c57e9 -s ours am: 88980744 -s ours am: baa104e2 -s ours

am skip reason: Merged-In Ide6ee346afdd6f9f0bca90a22465fd0d76af8b6a with SHA-1 ca78a01f is already in history

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

Change-Id: I4690f591d9c3ccec5fd337859d7461d4b8843834