Merge "Merge "Check for the COMPANION_DEVICE_APP_STREAMING role when registering a proxy" into udc-dev am: 95b99739 am: ae9195fb am: 80907e69" into udc-qpr-dev-plus-aosp am: 66531bcb

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



Change-Id: I2933451a741ac9a65a882f07a7862355396e77af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>