[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 566ede3d -s ours...

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 566ede3d -s ours am: db9cd2b5 -s ours am: 192afd71 -s ours

am skip reason: Merged-In I00b0b996794e61855872eea8b02c021aa5ed12d4 with SHA-1 824da3f5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/17545303



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