Merge "Disable battery saver when booting with sufficient battery am: 2763c2ba6c am: 994c5722d6" into nyc-mr1-dev-plus-aosp
am: cba0f3e8e4

Change-Id: Iac624fee086201a6c634f92802011ab362fea8e1