Merge "Fix the broken test on com.android.settingslib.utils.PowerUtilTest" into tm-dev