Merge change 1866 into donut

* changes:
  remove unused ContentResolver parameter from IntentResolver.queryIntent.