Merge "Merge "Annotate ChargingStatus as a state atom." into rvc-dev am:...
Merge "Merge "Annotate ChargingStatus as a state atom." into rvc-dev am: b7ba8ed6 am: 22d1212d" into rvc-d1-dev-plus-aosp am: 5af55792
Change-Id: I728785514b8663e5f07da74fb7b83979358ded76