Merge "Use a binder instead of a bundle in removeSubscriptionWithOptions" into nyc-dev