Merge changes from topic "am-4ee5bb9c56da45269b2811da98005308"

* changes:
  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
  [automerger skipped] Check that PowerManager#isInteractive is false before showing the AOD UI for screen off. am: e0d326d3 -s ours am: 12a3badc -s ours am: 1653e302 -s ours am: f3497dc5 -s ours am: 30169041 -s ours