Snap for 8166750 from bf99ff4571cea9b7931b9c7b67e96ef563d6ec2a to sc-qpr3-release am: 9e92b54048

Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/16828678

Change-Id: I17be0b760c36847561dec10c802695139e2fcc66
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/shared/device.mk b/shared/device.mk
index b7f788b..ebade7a 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -499,9 +499,11 @@
 #
 # GPS
 #
-PRODUCT_PACKAGES += \
+LOCAL_GNSS_PRODUCT_PACKAGE ?= \
     android.hardware.gnss-service.example
 
+PRODUCT_PACKAGES += $(LOCAL_GNSS_PRODUCT_PACKAGE)
+
 # Health
 ifeq ($(LOCAL_HEALTH_PRODUCT_PACKAGE),)
     LOCAL_HEALTH_PRODUCT_PACKAGE := \