Merge "Add systrace for resolveIntent()" into nyc-dev
am: f86ce78

* commit 'f86ce783c6726694ad9f6d5e9b5d3b58c3b7e09c':
  Add systrace for resolveIntent()

Change-Id: Ia4941ab8c94d6af8fb49b6899698e616beb270ae