[automerger skipped] Merge changes Ifb085003,I83d60b4b,Ide483451 am:...

[automerger skipped] Merge changes Ifb085003,I83d60b4b,Ide483451 am: 65042c69 am: 470cc742 am: 0c899588 -s ours am: aca87874 -s ours

am skip reason: Merged-In Ifb085003087aa1e270925c755fc6e819f0871dc0 with SHA-1 ab94af18 is already in history

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



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