Merging from ub-launcher3-qt-future-dev @ build 6018744

Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-qt-future-dev_6018744.html

Change-Id: I91b31e68109d0838ac836a13b6bfd5dca33649a1
Merged-In: Ic8bb5eccb6edc0cf639ac08c404c930981721760
diff --git a/Android.mk b/Android.mk
index 81a2976..9135970 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,7 +28,6 @@
 LOCAL_STATIC_ANDROID_LIBRARIES := WallpaperPicker2CommonDepsLib
 LOCAL_STATIC_JAVA_LIBRARIES := styleprotosnano
 LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_SDK_VERSION := system_current
 
 LOCAL_PACKAGE_NAME := ThemePicker
 LOCAL_PRIVILEGED_MODULE := true