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

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