Merge "Show charging status in addition to trust granted" into rvc-dev am: a5a27037 am: 8ba58831 Change-Id: I2e428fe3fc6917b34acd91e65e620bd9d05b7870