SystemUI: Fix Quick Settings appear when disabled

If you tap the clock on the status bar, then the next time you pull down the status bar on the
right side it will show the quick settings. Even if the user disabled quick pulldown.

Bug: https://paranoidandroid.atlassian.net/browse/AOSPA-59

PS2: fixed spacing

Change-Id: Ibb2efd27a96898ff11640c7a58c0686e2fefc75f
Signed-off-by: Parthipan Ramesh <parthipan.ramesh@gmail.com>
Merge "SystemUI: Fix Quick Settings appear when disabled" into kitkat