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

Change-Id: Ia52e29c61038388525f4375917b9d5763bcd1fc3