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

Change-Id: Ieb7bf7cc8d9fc54b56ec5f8d5caa723357c8ec6e