Revert "[1/2] Add battery level around unlock ring"

This reverts commit 32661e956ffd89ee9b1a8f8516fbc63ccb461cf0.

Conflicts:

	core/java/android/provider/Settings.java
Active display [squashed] (1/2)

Change-Id: I709196b232609a1dab8e9d7fdd0a6a655d487d93