Merge "Fix Robolectric Bluetooth tests"
am: 01c9c0e4ba

Change-Id: I7987ddaa520c202a15af03bf0791c39a1720d3b3