[automerger skipped] Merge "Update the battery broadcast receiver." into pi-dev am: a924a1e2ae
am: 73328b182a
-s ours
Change-Id: I384040dce91b275d466061e93152b60dd99ac7f8
This commit is contained in: