tree 560c976d11ed09b2c30703b8d9fd9c8edba014eb
parent dc579c1960f34f8970d3ec6c85aa5559d6232570
parent ca282c8cbf53e3e6c19494f0b2e15dea2e4211c2
author Brad Ebinger <breadley@google.com> 1614919301 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614919301 +0000

Merge "Define new permission to perform IMS RCS Reg actions and integrate ACCESS_IMS_SINGLE_REGISTRATION into APIS" am: ca282c8cbf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6d700bd7ac66bc6ffe2792ba67cebd15c826906