Merging from ub-launcher3-rvc-qpr-dev @ build 6861538

Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-qpr-dev_rvc-qpr-dev_6861538.html

Change-Id: I743cfd1a726d223ed6e1e5c0cfb9dc64a9d0c306
diff --git a/Android.mk b/Android.mk
index 1813e99..430b443 100755
--- a/Android.mk
+++ b/Android.mk
@@ -90,7 +90,11 @@
 LOCAL_PROGUARD_ENABLED := disabled
 LOCAL_MANIFEST_FILE := AndroidManifest.xml
 
-LOCAL_SDK_VERSION := current
+ifneq (,$(wildcard frameworks/base))
+    LOCAL_PRIVATE_PLATFORM_APIS := true
+else
+    LOCAL_SDK_VERSION := current
+endif
 LOCAL_MODULE := WallpaperPicker2CommonDepsLib
 LOCAL_PRIVILEGED_MODULE := true