Merge "Merge "Show charging status in addition to trust granted" into rvc-dev...
Merge "Merge "Show charging status in addition to trust granted" into rvc-dev am: a5a27037 am: 8ba58831" into rvc-d1-dev-plus-aosp am: 16f53700 am: db943171
Change-Id: I821d19c82eaa07e3a3af7e42792e8e96df447b3a