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

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

Change-Id: Iac08bb390ee1a5d6bbfc02afdb57e980cdad7597