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