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

Change-Id: Ie7f1581931c3bc2196f9ca66fc0e67e8ed0d2200