Snap for 7460608 from 5d1166dce5555eb147f47f8931c3f922b1b55665 to sc-d1-release

Change-Id: Id466de5ee95cdb9045e968c9ca77460d33b51ce8
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",