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

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

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