DO NOT MERGE - Merge Android 13

Bug: 242648940
Merged-In: Idb360b860b761545309fe2437a806a2430e134e5
Change-Id: Ia077584a3f5c60309865cd72a357f7ee68711940
diff --git a/Android.bp b/Android.bp
index e878c83..fc101d5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,19 +14,19 @@
 // limitations under the License.
 //
 
-// Standalone Wallpaper picker app
-// ========================================================
 package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+// Standalone Wallpaper picker app
+// ========================================================
 android_app {
     name: "WallpaperPicker",
     static_libs: ["android-support-v4"],
     srcs: ["src/**/*.java"],
     resource_dirs: ["res"],
-    product_specific: true,
     sdk_version: "current",
+    product_specific: true,
 }
 
 // Static library for target