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