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