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

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

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