[automerger skipped] Merge changes I32a3cc71,I1e507cf6 am: 00ba20d5 am:...

[automerger skipped] Merge changes I32a3cc71,I1e507cf6 am: 00ba20d5 am: 1ffdd407 am: 541514cc -s ours am: 6618cfa1 -s ours

am skip reason: Merged-In I32a3cc7113f9b19c001a102b865c28f4db3c338d with SHA-1 422c7430 is already in history

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



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