Merge "Merge "Deprecate Android beam APIs and create a feature flag to gate them" am: 6a3d45c4 am: d0c8a165 am: a33da54c"