Merge "Update Android Beam deprecated API description"