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

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

Change-Id: I8bc8b7010e68aa0bc4982429c975ad9bf742a28b