tree 528b4940fd626fae95d161580d31a3f651cbfe9c
parent 6e3eea1ef3d74533a61515f5d12b5aeac9f7a7fb
parent ab2e3bca15a108aaed2b00495de90eb8ad74a3b2
author Brad Ebinger <breadley@google.com> 1614586573 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614586573 +0000

[automerger skipped] Merge "[RCS UCE] Check the new added permission "ACCESS_RCS_USER_CAPABILITY_EXCHANGE" for UCE APIs" am: e9ae98ccf6 am: db3ffaff69 am: ab2e3bca15 -s ours

am skip reason: Change-Id Ie4bb5a7c836ce432617acec4d1eaa6ab520a934f with SHA-1 d563bc712e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43b42a09cf6ebe2866977d6867e2e652e79f0d76