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

Change-Id: If1d4c815aaaeea34dbc7437730659a356a32e14c