Merge "Recover AOD state when leaving battery saver" into rvc-dev am: f3736be0 am: be9db0cc am: a67f5493 Change-Id: Ie5c9e9eb5ae963b20455dfe61b7efffe7e82d5fc