Merge "Merge "Refactor how StatusBarPolicy knows if keyguard is visible." into...
Merge "Merge "Refactor how StatusBarPolicy knows if keyguard is visible." into nyc-dev am: bbd26bc0 am: 05f2a86b" into nyc-mr1-dev-plus-aosp
am: ea0badc4
* commit 'ea0badc4':
Change-Id: I1f4e1ffed4406989ede288dc5e40ebbd6e50751c