Merge "AOD: Don't use doze states when unsupported"