am 914c8c87: Merge "Revert "Add a way of generating a CustomTabsSessionToken from an intent"" into mnc-dev

* commit '914c8c871ac47633fbd704a354fce788f9b2b7b7':
  Revert "Add a way of generating a CustomTabsSessionToken from an intent"