[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: f3996ac0 -s ours am: c7b2ba27 -s ours

am skip reason: Change-Id Ia4b419cc954aaf03a7492e225e7bd9e5fc42aba0 with SHA-1 efe90de5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32933fbe425835c54e3bf803919765895c10db82