[automerger skipped] Merge "Convert BatterySaverButton controller to Slice compatible." into pi-dev am: 87dfe60ad0
am: b82d639f34
-s ours
Change-Id: I6970932b5536ee4938e20802ce8041295b4923d7
This commit is contained in: