am fdf87001: am b0d449b9: am 7f2ba521: Merge "Add a way of generating a CustomTabsSessionToken from an intent" into mnc-dev

* commit 'fdf8700100328aa698c90578cecea9818958dee4':
  Add a way of generating a CustomTabsSessionToken from an intent