Merge QP1A.190711.012

Change-Id: I8844ae8e79c8852c33b77faf0fa9f376a0423092

nfc/libnfc-nci.conf

@@ -35,7 +35,7 @@ SCREEN_OFF_POWER_STATE=1
 # NFA_TECHNOLOGY_MASK_KOVIO         0x20    /* Proprietary Technology       */
 # NFA_TECHNOLOGY_MASK_A_ACTIVE      0x40    /* NFC Technology A active mode */
 # NFA_TECHNOLOGY_MASK_F_ACTIVE      0x80    /* NFC Technology F active mode */
-#POLLING_TECH_MASK=0xEF
+POLLING_TECH_MASK=0x2F
 
 ###############################################################################
 # Force P2P to only listen for the following technology(s).
@@ -48,7 +48,7 @@ SCREEN_OFF_POWER_STATE=1
 # NFA_TECHNOLOGY_MASK_F             0x04    /* NFC Technology F             */
 # NFA_TECHNOLOGY_MASK_A_ACTIVE      0x40    /* NFC Technology A active mode */
 # NFA_TECHNOLOGY_MASK_F_ACTIVE      0x80    /* NFC Technology F active mode */
-#P2P_LISTEN_TECH_MASK=0xC5
+P2P_LISTEN_TECH_MASK=0x00
 
 ###############################################################################
 # Force UICC to only listen to the following technology(s).