Merge "Merge "Mock on-battery state correctly on batteryless devices." into pie-cts-dev am: 2530ff11"