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

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