Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"
am: 21187ba5cc

Change-Id: Iae5a62d77719833dc91c881bd3b90c9ab327a0bf