[automerger skipped] Merge "Define new permission to perform IMS RCS Reg actions and integrate ACCESS_IMS_SINGLE_REGISTRATION into APIS" am: ca282c8cbf am: a0f85ebf75 am: 77e564bfba -s ours am: 58f3d320c6 -s ours

am skip reason: Change-Id I6d4ae879d9d2b347f6576ea20f9e42454b39936b with SHA-1 f7607fbcad is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If39fa2bc069967ae0b026b309cb24844841a0b10
This commit is contained in:
Brad Ebinger
2021-03-05 05:21:12 +00:00
committed by Automerger Merge Worker

Diff Content Not Available