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: 4e244ce8

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



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