[automerger skipped] Merge RQ2A.210305.007 into stage. am: 39e00dc717 -s ours

am skip reason: Change-Id If7f78c0e472eb369b94557f7b1d5b83682d47e71 with SHA-1 0aa4089f45 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/13722563

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ffcb5127d8f601e77482afd6d512627cf79ef1c