[automerger skipped] Merge "Hide quicksetting tile for dev options when it's turned off" into pi-dev
am: 4c16ad5abf
-s ours
Change-Id: I7a8f95eda10b14e0fd067a15dae38cd3751566f2
This commit is contained in:
am: 4c16ad5abf
-s ours
Change-Id: I7a8f95eda10b14e0fd067a15dae38cd3751566f2