Merge "Explicitly set generate_hashtree: false" into sc-dev am: a2d7f961 am: 386c27f0 am: 6522dd40

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14965613

Change-Id: I2c189fb12ec3eb08b3d8876338208e9b278dc4ca