Merge "Replace usages of getPriority and PRIORITY constants with getConnectionPolicy and CONNECTION_POLICY constants in Nfc"
am: 3224733e0a

Change-Id: I399031393a7d109b08984f5495ce3d79a7fe4f28