[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 9f7e3127 -s ours am: 55cff57c -s ours am: 171d17ce -s ours am: f96c3103 -s ours

am skip reason: Change-Id Ic57a78cfbb8ce71719e35bbe8c6b2b142c7eddde with SHA-1 069713fd is in history

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

Change-Id: I0b6a82f7e5033e612b37b7fa626457bde76f3301