Merge "Fix unprotected StatusBarManagerService calls" into nyc-dev