Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"...
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a197" into oc-dr1-dev-plus-aosp
am: 644c0a26
Change-Id: Ief370d2eefa32003ff9809c0a36f972847bc645b