Merge "SysUI: reset mCanDismissKeyguard in setBarState" into new-mm6.0