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

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