[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: f92796fd42 -s ours am: ae20eebae0 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/15023934

Change-Id: I04fabf925224a2217438fb9bd355e3b06dcd8e28