Merge "Use disableForUser in StatusBarManager" am: 5392d799ab am: 3f3aa3518f
am: f63718533f

Change-Id: I56252602d09602507400b1e9d9bb08dfce93d4e0