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

Change-Id: I6bad7c49519869dd60e130e5a31cf3514b0896c1