Merge "Respect UI Context for getDisplay" into rvc-qpr-dev am: c5ba62307c am: 117b9ab1d8

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

Change-Id: Ib7ed054c9016abdc348b66e57635998cec91dca2