Merge "CustomTabs: Use ActivityCompat and ActivityOptionsCompat" into mnc-ub-dev