tree df279a0f2a0b035a1ba6fe410b6cd095f052ff88
parent ebf96dea4e23489230c11cccdd4c3a44453fa1d1
parent 7b4068e3aae36f71d3a2ae5e9a0d8f0b9d560795
author Brad Ebinger <breadley@google.com> 1614919301 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614919301 +0000

Merge "Update sms test app and integrate PERFORM_IMS_SINGLE_REGISTRATION into permission checks" am: 7b4068e3aa

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d186ec522a561949fef9d793be65037a7767cd4