From: Makoto Onuki <omakoto@google.com>
Date: Tue, 5 Jun 2018 00:40:26 +0000 (-0700)
Subject: Merge "Ensure automatic battery saver won't stick" into pi-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6e7625b0e2;p=android-x86%2Fframeworks-base.git

Merge "Ensure automatic battery saver won't stick" into pi-dev
am: c1203d6a96

Change-Id: I98897510188c38309f708d86802f83ef3573984d
---

6e7625b0e2516e8512e6a714181fe986123ac2d1