[automerger skipped] Merge changes I45b993c4,I09b09408,Ia7406fbe,Ic6ba2d66 am:...

[automerger skipped] Merge changes I45b993c4,I09b09408,Ia7406fbe,Ic6ba2d66 am: fa4d40f9 am: 7927011a -s ours am: 7dfa29c8 -s ours

am skip reason: Merged-In I45b993c4dd444d1834b41b0825bcff021ee94f66 with SHA-1 cb5d80f4 is already in history

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



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