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

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

Change-Id: Ia5f43e21a15ddc34b2eceff4ecd79346402ddf2e