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