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

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