Merge "Mock on-battery state correctly on batteryless devices." into pie-cts-dev am: 2530ff11d9 am: 6098ad6504
am: 1e940bc1a5

Change-Id: Ifcb4d4cc0866691a21e1193058606c80a6d93637