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

Change-Id: Ib90a91ba2fc5fe610e432b61ec2a1c961fd63655