Merge "Fix Robolectric Bluetooth tests" am: 01c9c0e4ba
am: 2f1cb548ba

Change-Id: Ifded4e54edd53242a40d3f8e123f614cd6e44d84