Merge "Add bluetooth related timeouts adapter methods"
am: f9e416e515  -s ours

Change-Id: I39324b958f82a8e60cd243a61b859024351cf496