am 9d20663d: am 0b828ee0: Merge "Set the correct flags for brightness dialog to show on all users" into jb-mr1-dev

* commit '9d20663d467a9002a8bb2c12a1edbfe35df2c399':
  Set the correct flags for brightness dialog to show on all users