Merge "Add bluetooth related timeouts adapter methods" am: f9e416e515  -s ours am: b78a09c659  -s ours am: 7fc090b6db  -s ours
am: 533a203caf  -s ours

Change-Id: Ia7eb2708a2144f2a7581b9274b2204f746ce1a1c