[automerger skipped] Merge changes from topic "GROUP_UUID" into sc-qpr1-dev...

[automerger skipped] Merge changes from topic "GROUP_UUID" into sc-qpr1-dev am: 7fe37f43 -s ours am: 4e271c9a -s ours

am skip reason: Merged-In I8d7cc836402a9a7695c972860d38035c4ec0fa44 with SHA-1 f2175327 is already in history

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



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