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

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



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