Merge "Remove Nfc beam sharing capability" am: 1ddae3e4a9 am: 6e9686146b am: 2823c66f49 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2475610 Change-Id: I378f6a2279a48ef44e86a50029c9d7884fcc1db9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>