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