[automerger skipped] Merge "Merge TP1A.221005.003" am: 1a1195cf -s ours

am skip reason: Merged-In I832ddcc80f4e92d487bd0fa93ec63f74e4978de3 with SHA-1 2d9b1202 is already in history

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



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