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

Change-Id: Ife5792584ec8af1fc8decc83436c567e23ab62b8