Merge "Explicitly set generate_hashtree: false" into sc-dev am: a2d7f961 am: 220a3a4f am: 69ede3fc

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

Change-Id: I623fdf9918941633e3be0baadee0d8efb8664503