Merge pi-dr1-dev to aosp-master

Change-Id: I45c3cadf3c8142431289504e239cad65d71056d0
tree: 6da68890b4216884fdfb84cca87fecbb3770af9c
  1. QuickSettings/
  2. Settings/
  3. OWNERS
  4. PREUPLOAD.cfg