Merge "DOZE instead of DOZE_AOD when batterySaver=active" into tm-dev