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

Change-Id: Ia241e7b661d3319c1f19f06c42110bce7799b99a