[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am:...

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

am skip reason: Change-Id I0bf7c8b267a0c9cd877328c4ff3169950e1ff64f with SHA-1 1221ede9 is in history

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

Change-Id: I50bf61c1b89db848456ddcebea074885088477e5