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

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



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