Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

Bug: 172690556
Merged-In: Iae35596629c0a396e24a9877c2c4e99322c4b495
Change-Id: I84b3f43dd187e541a0b93698b92cc46be37bc755
diff --git a/plat_private/property_contexts b/plat_private/property_contexts
index e047f96..21798f3 100644
--- a/plat_private/property_contexts
+++ b/plat_private/property_contexts
@@ -9,4 +9,5 @@
 persist.adb.nonblocking_ffs u:object_r:exported_default_prop:s0 exact int
 
 #============system fingerprint property===========
-ro.system.build.fingerprint u:object_r:fingerprint_prop:s0 exact string
+# GOOGLE: commented out in favor of aosp/1484898
+#ro.system.build.fingerprint u:object_r:fingerprint_prop:s0 exact string