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

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

Change-Id: I2d2545061e3f5c83a3e00aae7425228c1be17f13