Merge "Fix batterySendBroadcast not synchronized issue."
am: 32e756a4bc

Change-Id: Ieab665e92bdb17c449c82de66604fbef5688de17