[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 440f0cde -s ours am: 0aa0db49 -s ours

am skip reason: Change-Id I2f51cde81755760125be620ef7e6385ae9a2a37e with SHA-1 c309d5ac is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/13122648

Change-Id: I7b8314d607224b3ee502f730193b7f6881321376