DO NOT MERGE - Merge RQ3A.210805.001.A1. am: b2ce378d97 am: 7142130cef

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

Change-Id: I946376854846dd40a50b80e9ddb46fded460778d