[automerger skipped] Merge changes I832ddcc8,Id54258d0 am: e71fb947 am: 7b9caeb0 -s ours

am skip reason: Merged-In I832ddcc80f4e92d487bd0fa93ec63f74e4978de3 with SHA-1 06c7cada is already in history

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



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