Merge "Ignore failing tests of com.android.settings.deviceinfo.batteryinfo" into main