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

Change-Id: I91b4522d745246aee684d94da04fa9b688d5cd51