Merge "Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc...
Merge "Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5 am: 1a6d0d75" into oc-dev-plus-aosp am: 808ae634" into oc-dr1-dev-plus-aosp am: e3053f33"