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

Change-Id: I9117f76d5a03d3aa222c87338bd7249184b3041d