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