Merge "Limit the retry attemps on restarting Bluetooth" am: 46af84f892
am: 544a38b298

Change-Id: I7e0dcdf723c077046523d2a51024e883b0af1062