Merge "Fix legacy role holder resolution for assistant, dialer and SMS." into qt-qpr1-dev
am: d4c175c156

Change-Id: I62be5d3c6b14dc0999e213f1adaf3da5cea46634