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

Change-Id: I6305379f787de122e35a9a2a12eb9f99385da4df