[automerger skipped] Merge changes from topic "am-b83fc5b0dcfc43208a9ca1af164efd6e" into stage-aosp-master am: 29270c42b3 -s ours am: 2c4e89c490 -s ours

am skip reason: Change-Id I8e948878e8ee107a0095312613466ceb1717508c with SHA-1 b48cf45d31 is in history

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

Change-Id: I2d22f1e8818279dcccbc331d7bd3ef1ba7927ed2