[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: cd3d55c6 -s...

[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: cd3d55c6 -s ours am: 029afeca -s ours am: 28e29989 -s ours

am skip reason: Merged-In I0394e528c043c87faba687039f4456c8c89c4cae with SHA-1 f7b3f975 is already in history

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



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