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

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

Change-Id: I05a3fbf1340f252d7ec9af0b5d1f91a27f9a6ef1