Merge "Remove Nfc beam sharing capability" am: 1ddae3e4a9

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2475610

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