Merge "Update Android Beam deprecated API description" am: 527b6de018
am: 8b855b16f3

Change-Id: I461e11ff4129c61783bf988ae425a32c9b60e20f