Merge "Show charging status in addition to trust granted" into rvc-dev am: a5a27037 am: 18e3cae3 Change-Id: Ic71187a768fba854d0ce02e3abe3fc6c704c7ed5