am e252525f: Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev

* commit 'e252525f6fda8dad56566d78a4881ab35778e9a6':
  Add extra to ASSIST intent to indicate potential input type