Merge changes from topic 'am-993c43530b0f4dacbb88b40a1b1760de' into oc-mr1-dev-plus-aosp
* changes:
Keyguard: only show after screen fully turned off am: 4757c8cc am: 793e0eea
StatusBar: Switch status bar to using the new lifecycles am: 731d4dfe am: be0f7497