Merge "Fix Broken test: Package: com.android.settingslib.bluetooth"