Merge "Merge "Refactor how StatusBarPolicy knows if keyguard is visible." into nyc-dev am: bbd26bc0 am: 05f2a86b" into nyc-mr1-dev-plus-aosp