Merge "Make assistant button display the icon of the role holder application" into rvc-dev am: 0b1e87f869 am: 58029373ca am: 49aa5a8275 am: 995a970af7
Change-Id: I015f7fa904cf7463f4124df944eea34a7ddcf2e9
This commit is contained in: