Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: 5a9286bacf -s ours

am skip reason: Merged-In I052f7670cc2423fd62499dc94a411aa78b0d8c2e with SHA-1 304855bc3c is already in history

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

Change-Id: I59bbc5eb13dbd44ad46ecfa713c900ecfc0882aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>