Merge "[Status Bar] Disable the keyguard status bar when we get the DISABLE_SYSTEM_INFO or DISABLE2_SYSTEM_ICONS flags." into tm-qpr-dev