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

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

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

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