Merge "Remove Nfc beam sharing capability" am: 1ddae3e4a9 am: 6e9686146b am: 2823c66f49 am: 8e0a97b175

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

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