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

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



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