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

Merge "[automerger skipped] Check that PowerManager#isInteractive is false before showing the AOD UI for screen off. am: e0d326d3 -s ours" am: 7f8a9ffd -s ours am: 365a0a28 -s ours am: 37c1015e -s ours am: d1b652f4 -s ours am: 407e5246 -s ours

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

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

Change-Id: Id60c1cd32c8de405e15d03aa57dec256618cabfe