Merge "[automerger skipped] Check that PowerManager#isInteractive is false before showing the AOD UI for screen off. am: e0d326d3fd -s ours"