Merge "Once auto-battery saver is ever set, don't show suggestion" into pi-dev
am: 69ade35741

Change-Id: I7820e690da6f5540fb1da368556a98f27df16280