[automerger skipped] Merge changes I391d0686,I8cf90be4 am: de432c79 am:...

[automerger skipped] Merge changes I391d0686,I8cf90be4 am: de432c79 am: ebbc62c1 -s ours am: 1a58c513 -s ours

am skip reason: Merged-In I391d068697dc04e0501bda9fdb5508b0ddea90e4 with SHA-1 172c835c is already in history

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



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