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

Change-Id: I13676ddd4498df457ad11918ad73bfcdcf3297a1