[automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: b2ce378d97 am: 7142130cef am: 158febe2f4 -s ours am: 7150ad8b14 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6327d498fb105079c4f1e079b003cc184c21bcbc