Merge "Add global setting for auto-battery saver threshold max" into pi-dev
am: fa63f6895b

Change-Id: Id4e36e3c2b1eb5ab57cd491f71f7ddd5f1736fe3