[automerger skipped] Merge "Check that PowerManager#isInteractive is false...

[automerger skipped] Merge "Check that PowerManager#isInteractive is false before showing the AOD UI for screen off." into sc-v2-dev am: 34e29db6 am: e5111613 -s ours

am skip reason: Merged-In I7e2d1ca7e3c9487903f74fb06575cc0a36b9502c with SHA-1 a20d7f27 is already in history

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

Change-Id: Ida83870330e1373712a8c9e5e32ed2715bd98a62