Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev am: 99ff7405a3
am: 44d11d1328

Change-Id: Ibaad489158ec1d1c815db0e8a182e76810e335a4