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

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

Change-Id: I574d9835d471d4689fc02ea034bad1483b2d11c3