Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into...

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

am skip reason: Merged-In I6b073f730282ca68311b4407936871e65663cc7a with SHA-1 77a487a3 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2338383



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