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