[automerger skipped] Merge changes Icfb050d8,I678d5d8b am: a6d7c4f8 am:...

[automerger skipped] Merge changes Icfb050d8,I678d5d8b am: a6d7c4f8 am: 973c6b8f am: 3dcdc07b -s ours am: af691624 -s ours

am skip reason: Merged-In Icfb050d8ba7daf9f4f37b51705fcab769f4c8823 with SHA-1 4aebb671 is already in history

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



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