[automerger skipped] Merge "Remove bundled CompanionDeviceSupport permissions"...

[automerger skipped] Merge "Remove bundled CompanionDeviceSupport permissions" into rvc-qpr-dev am: 2aa95e8d am: c3559532 -s ours

am skip reason: Change-Id Ib96198a39c18a0b9c3cf64c0c58c89b1a5b62c19 with SHA-1 c7a0cefd is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a65d2a2ab8c06cd873cabc2b84b1258ac920243