Merge "AOD: disable quicksettings while dozing" into oc-dev am: 1c4c981c03
am: 1eb27d06c5

Change-Id: I75bac43421227497d68e5e28790c256f86624421