[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: 747cd61d42 am: cad49d3c2c am: 19958eb1a1 -s ours am: 870b99433b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie30c03b0d9287b1e19ce80967073abb29548b54a