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

Change-Id: I54c98d84d90a7317d949cefc898f7bdf92649c86