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" into stage-aosp-master am: 17f2f163" into oc-dev-plus-aosp am: bdbe454b" into oc-dr1-dev-plus-aosp
am: 7b865039

Change-Id: Ic09a182d0ac0293c25752ce95a846e2d8321ee01