DOZE instead of DOZE_AOD when batterySaver=active

So we don't mistakenly briefly show the AOD UI
when entering AOD with battery saver active.

Test: manual
Fixes: 219030172
Change-Id: Ida3b52a3a091736b8ba2d3ad614662a0ac4724e1
5 files changed