Merge "Merge "Show charging status in addition to trust granted" into rvc-dev am: a5a27037 am: 8ba58831" into rvc-d1-dev-plus-aosp