Merge "Fix legacy role holder resolution for assistant, dialer and SMS." into qt-qpr1-dev am: d4c175c1 am: 9d15770e Change-Id: I59dedef6e000648c284190624fc938dd581a9743