Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: 747cd61d42 am: cad49d3c2c

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

Change-Id: I872dd38f1819b2776d16ac05cdd875a2dbbc23d1