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