Merge stage-dr1-aosp-master into stage-aosp-master

Bug: 112535855
Change-Id: I08eacf6f10bdc371dfa854a4eb404cf914eef8d0
tree: 79c77333cea92dd14b10853fae3e99f2db08f98b
  1. QuickSettings/
  2. Settings/
  3. OWNERS
  4. PREUPLOAD.cfg