Merge "Remove deprecated NFC beam support" am: 19df6070a1 am: 6cf1ac7bae am: ccbd20ced2 am: c1ada5a2cf am: 98e73d986a

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

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