Merge "Remove AndroidBeamDemo from samples" am: a7ade46095 am: d87ab4e5b5

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

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