Merge "Trust System UI owned display to receive keys" into rvc-dev am: 94deecfda2 am: d09b0f10bf am: 8fccd6e144

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

Change-Id: I75db01ccbe3e051b0fe21522efe771387632e31f