Merge "Revert^2 "Remove samples for deprecated Android Beam API"" am: c01e15bdcb am: c4fc02d6bc

Original change: https://android-review.googlesource.com/c/platform/development/+/2476066

Change-Id: Ib234d5dd4a44ce1909f868d116a5dc501c83a78d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>