Merge "Sending BATTERY_LEVEL_CHANGED when plug type changes" into pi-dev am: 8cb78fcb1e
am: 25feb29a48

Change-Id: Ie0539b3368d826f563a6296e9d577ea252e7f73b