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

Change-Id: Icf289127886daf7eccd383aef18bd155f0d3ec67