Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc...
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
Change-Id: Ie830aa79d8a380fcf85fac617ab183b02819468a