Merge "Support battery level reporting via Plantronics XEVENT (1/2)" am: c79c4240ec
am: c286110c1a

Change-Id: I37cb48012b0f7170415693476d7e9f105798d814