Snap for 11224086 from 82652e5176e4bfa0230a0f3a6cd3eda7d8f7427a to mainline-tzdata5-release

Change-Id: I22cc59c779a530ad4d8590670cf3ccc0b17e1ef0
diff --git a/device-cheetah.mk b/device-cheetah.mk
index 986b0e1..4be40c9 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -306,7 +306,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=27
+    ro.vendor.build.svn=36
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/device-panther.mk b/device-panther.mk
index e0d2061..f4ed67e 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -291,7 +291,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=27
+    ro.vendor.build.svn=36
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/location/gps.xml b/location/gps.xml
index 98eb66d..77fec48 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps.xml.c10 b/location/gps.xml.c10
index a14f956..6ad7053 100644
--- a/location/gps.xml.c10
+++ b/location/gps.xml.c10
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps.xml.p10 b/location/gps.xml.p10
index bb1f1ae..2e13754 100644
--- a/location/gps.xml.p10
+++ b/location/gps.xml.p10
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml b/location/gps_user.xml
index 45ddef9..3af6cca 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10
index 301b2a2..d4f596b 100644
--- a/location/gps_user.xml.c10
+++ b/location/gps_user.xml.c10
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10
index ff7ba73..cf367e7 100644
--- a/location/gps_user.xml.p10
+++ b/location/gps_user.xml.p10
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"