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

Change-Id: Ifb7b0b834fcc0e37d499f13513ae2361f5af4775