[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: 80a792e5 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I222c7110f2ae7d360c9068b84b24b1a724d8c939