Use WP2 BuildCompat library until androidx library stabilizes
Bug: 132340681

Change-Id: I0be7b097c459f46a2764ab3f254519c4e3b29fe0
diff --git a/src/com/android/customization/picker/CustomizationPickerActivity.java b/src/com/android/customization/picker/CustomizationPickerActivity.java
index 281ff78..b85948d 100644
--- a/src/com/android/customization/picker/CustomizationPickerActivity.java
+++ b/src/com/android/customization/picker/CustomizationPickerActivity.java
@@ -28,7 +28,6 @@
 
 import androidx.annotation.IdRes;
 import androidx.annotation.Nullable;
-import androidx.core.os.BuildCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
@@ -57,6 +56,7 @@
 import com.android.customization.picker.theme.ThemeFragment.ThemeFragmentHost;
 import com.android.customization.widget.NoTintDrawableWrapper;
 import com.android.wallpaper.R;
+import com.android.wallpaper.compat.BuildCompat;
 import com.android.wallpaper.model.WallpaperInfo;
 import com.android.wallpaper.module.DailyLoggingAlarmScheduler;
 import com.android.wallpaper.module.FormFactorChecker;
@@ -179,6 +179,9 @@
         if (!BuildCompat.isAtLeastQ()) {
             return;
         }
+        //if (!BuildCompat.isAtLeastQ()) {
+        //    return;
+        //}
         if (Build.TYPE.equals("user")) {
             return;
         }