[automerger skipped] Merge "Skip RP1A.200720.011" into stage-aosp-master am:...

[automerger skipped] Merge "Skip RP1A.200720.011" into stage-aosp-master am: 5afd1abd -s ours am: 80de2319 -s ours

am skip reason: Change-Id I8cd7858fc3fd183cae6ed42d110bff588afec14c with SHA-1 55d6ded4 is in history

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

Change-Id: I1e2a068c41856e29204e438f2e65cd3f144e31e0