Merge "Annotate ChargingStatus as a state atom." into rvc-dev am: b7ba8ed645

Change-Id: I3a25fdb5b19b989949f1a708d87ab0a7e75f69c6