[automerger skipped] Merge changes I832ddcc8,Id54258d0 into tm-dev am: 3cfa5c66 -s ours

am skip reason: Merged-In I832ddcc80f4e92d487bd0fa93ec63f74e4978de3 with SHA-1 0703091b is already in history

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



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