[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 81263271 -s ours am: 9814258b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9b819ac98973eac8cff6f6a77b22c98f9e2d95d9