Merge "Merge "Query the display status from DisplayInfo" into tm-d1-dev am:...

Merge "Merge "Query the display status from DisplayInfo" into tm-d1-dev am: ce7dcdce" into tm-qpr-dev am: e9cba255

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



Change-Id: I9f128626de43ceb6f9699ed5a8b0b3c6d58c4b62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>