Merge "Recover AOD state when leaving battery saver" into rvc-dev am: f3736be0b3 am: be9db0cc52 am: b3e23849fd
Change-Id: I02dde5e0de8f86402a7e51b031f3cb286e70bcf4
This commit is contained in: