[automerger skipped] DO NOT MERGE: Introduce DPMS shim for active DO/PO check am: 5c91bdecce am: 84ca530ba7 am: 262771be94 am: c82f075f92 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196 Change-Id: Id6810e59354ad617785eeba7ca8600ea3778dc06
This commit is contained in: