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: 324e0a3e am: 7ca325d4 am: 3491bf9b

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



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