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

Change-Id: I6edef06c6e0c94dc8c5d27003f19b60b2f6c5f4c