[automerger skipped] Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO...

[automerger skipped] Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO check" am: 81796976 am: b0c59d4b am: b9ef876c am: 275329ba -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idd15b5c294966297136e45d19c9ff238d47c2983