Merge "Deprecate Android beam APIs and create a feature flag to gate them"