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

Change-Id: I42b7bd79ec82e8695826ab84e11a6f4d7a0912fd