Minor changes on top of memory leak fix ag/4607657

Fix: 80443940
Test: "adb shell cmd battery unplug" and "adb shell cmd battery set ac 1",
observe memory usage from Android Monitor.

Change-Id: If095a5a88bf43485f2b1ab6da4cab0c87099b90b
1 file changed