[automerger skipped] Fix security vulnerability when register phone accounts. am: 833dd8480a am: 581e22326e am: a0d2781092 am: 275debd2b6 am: cf69b11301 am: cc6243dcd8 -s ours am: ddce3b0c60 -s ours

am skip reason: Merged-In I8f7984cd491632b3219133044438b82ca4dec80e with SHA-1 ce3216cbde is already in history

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

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