[automerger skipped] Merge "Update sms test app and integrate PERFORM_IMS_SINGLE_REGISTRATION into permission checks" am: 7b4068e3aa am: 016b62f696 am: fb3d781954 -s ours am: 5bac02d871 -s ours

am skip reason: Change-Id I91c5e49450545b76c6ccbaa900388abcc756aeb8 with SHA-1 8ea8e9e619 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I225ab93b61492b47658d819256fa38043bb8e9b5