[automerger skipped] Mark RP1A.200720.001 as merged am: d9391c98 -s ours am:...

[automerger skipped] Mark RP1A.200720.001 as merged am: d9391c98 -s ours am: 736e5a5d -s ours am: 9df74523 -s ours

am skip reason: Change-Id I1c9438eef0d3c40d8466bf494e686e7e6535f5b9 with SHA-1 2b8b215d is in history

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

Change-Id: I09e3418da689780663cd49761975101aab6d0246