[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: e3b75eec54 -s ours am: d3844aff18 -s ours am: 8db765e39a -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6694ca7dfdd75e6525596e755d0f8f91094d515