Snap for 7460045 from cb0a2a8c0bf2b829a8cc6a5c328661e266ab26fa to sc-v2-release

Change-Id: Iaea590709d473007d7417bbb25131684e04f522a
diff --git a/apex/com.android.geotz/Android.bp b/apex/com.android.geotz/Android.bp
index f0e977b..145988d 100644
--- a/apex/com.android.geotz/Android.bp
+++ b/apex/com.android.geotz/Android.bp
@@ -20,6 +20,7 @@
 apex_defaults {
     name: "com.android.geotz-defaults",
     updatable: true,
+    generate_hashtree: false,
     // TODO(b/174024269) Change this to the value for S once the API level is
     // final.
     min_sdk_version: "current",