Merge "Update Android Beam feature summary string" am: 27a59e1d2c
am: abe9a41d19

Change-Id: I0a2cf7b82818102adc857cd38007a6e3ba7b4dd9