[automerger skipped] Merge TP1A.221005.003 am: 3b33a159 -s ours am:...

[automerger skipped] Merge TP1A.221005.003 am: 3b33a159 -s ours am: 457628ae -s ours am: 4fbcd56b -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: I860e0132e42ebedf0759cc9e98469176e45fe5a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>