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

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

Change-Id: I21d9dc39c37d455568a751bef54f625a4cc312ea
Signed-off-by: Automerger Merge Worker <[email protected]>