Merge "Refactor how StatusBarPolicy knows if keyguard is visible." into nyc-dev