[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: c4391035 am: 0f55e920 -s ours am: 42119d6f -s ours am: f158706f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6f4a059a88bd9ffae01ff6d22df62c197d1eefe4