Merge "Fix "auto battery saver notification comes back"" into pi-dev
am: 167032ab00

Change-Id: I2f1d971f2ca72fe5b4571027182235caf15f6575