Merge branch 'tm-qpr2' into 'tm-qpr2'

Import AmbientStreaming & fix ASI

See merge request statixos/google-mobile-services!6

common/Android.bp

@@ -315,6 +315,18 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "AmbientStreaming",
+	owner: "gms",
+	apk: "proprietary/product/priv-app/AmbientStreaming/AmbientStreaming.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
 android_app_import {
 	name: "ConfigUpdater",
 	owner: "gms",
@@ -331,7 +343,7 @@ android_app_import {
 	name: "DeviceIntelligenceNetworkPrebuilt",
 	owner: "gms",
 	apk: "proprietary/product/priv-app/DeviceIntelligenceNetworkPrebuilt/DeviceIntelligenceNetworkPrebuilt.apk",
-	certificate: "platform",
+	presigned: true,
 	dex_preopt: {
 		enabled: false,
 	},
@@ -343,7 +355,7 @@ android_app_import {
 	name: "DevicePersonalizationPrebuiltPixel2020",
 	owner: "gms",
 	apk: "proprietary/product/priv-app/DevicePersonalizationPrebuiltPixel2020/DevicePersonalizationPrebuiltPixel2020.apk",
-	certificate: "platform",
+	presigned: true,
 	dex_preopt: {
 		enabled: false,
 	},

common/common-vendor.mk

@@ -182,6 +182,7 @@ PRODUCT_PACKAGES += \
     YouTube \
     arcore \
     talkback \
+    AmbientStreaming \
     AndroidAutoStubPrebuilt \
     ConfigUpdater \
     DeviceIntelligenceNetworkPrebuilt \

proprietary-files.txt

@@ -1,5 +1,8 @@
 # All unpinned blobs below are extracted from cheetah-td1a.220804.031-factory-6152f6f3
 
+# AmbientStreaming
+-product/priv-app/AmbientStreaming/AmbientStreaming.apk;PRESIGNED
+
 # AndroidAuto
 -product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk;PRESIGNED
 
@@ -135,7 +138,7 @@ product/app/WebViewGoogle/WebViewGoogle.apk.gz
 -system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk;PRESIGNED
 
 # Intelligence
--product/priv-app/DeviceIntelligenceNetworkPrebuilt/DeviceIntelligenceNetworkPrebuilt.apk
+-product/priv-app/DeviceIntelligenceNetworkPrebuilt/DeviceIntelligenceNetworkPrebuilt.apk;PRESIGNED
 
 # Keyboard
 -product/app/LatinIMEGooglePrebuilt/LatinIMEGooglePrebuilt.apk;OVERRIDES=LatinIME;PRESIGNED