am c4aa3c78: Merge "Add status bar flag to disable quick settings" into mnc-dev

* commit 'c4aa3c781a0ddce64853cd5d88bf97f8a9faf98b':
  Add status bar flag to disable quick settings