Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO check" am: 817969762e am: b0c59d4b6b

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

Change-Id: I427bd9d552a512b6cc2280ac6dc773d355b74cad