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

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