[automerger skipped] Check that PowerManager#isInteractive is false before showing the AOD UI for screen off. am: e0d326d3fd -s ours am: 12a3badc91 -s ours am: 1653e30250 -s ours am: f3497dc5bd -s ours

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

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

Change-Id: I662d3bb725cec646b1a89326cee1e96d6afed5af