DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I9b6cdde551b04a527814ae70e1cb99cb9af6aab0
tree: 7bc0019ebaacf07e927afa3071db83f397847832
  1. QuickSettings/
  2. Settings/
  3. OWNERS
  4. PREUPLOAD.cfg