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

Change-Id: Ifd748681c9edf5216ba0040aea8cacbce49b6877