Merge "Restrict proxies for displays owned by the caller" into udc-dev am:...

Merge "Restrict proxies for displays owned by the caller" into udc-dev am: 968df9f7 am: 44003b5e

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



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