Merge cherrypicks of [2622852, 2622193, 2622194, 2622195, 2622933, 2622990, 2622991, 2622992, 2622993, 2622994, 2622995, 2622934, 2622196, 2622975, 2622996, 2622997, 2622998, 2623050, 2622935, 2622197, 2623051, 2622936, 2622918, 2622919, 2622999] into oc-release

Change-Id: Ica7005a5176e9b7bb825c1c2887642d7b5373a0b
tree: 233c15b3ee96fb64cfcc2e61b183cb4d301b8898
  1. QuickSettings/
  2. Settings/
  3. PREUPLOAD.cfg