Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO check" am: 817969762e am: b0c59d4b6b am: b9ef876ca1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196 Change-Id: I8498b1d2eff4e149c87e2546615e3fc33ab3c76f
This commit is contained in: