Merge "Revert^2 "Remove samples for deprecated Android Beam API""