Merge "Sticky battery saver" into pi-dev am: 110a7c20f4
am: 7e62948ab3

Change-Id: Iabfe51042c3982d1d7315d5975d6b1a23594b443