Merge "Show charging status in addition to trust granted" into rvc-dev am: a5a270378d am: 8ba58831aa

Change-Id: Idb0a24cc7a101523f71bce1c78b0527e7c7ab48b