Merge "Temp skip /product folder during root-hash calculation." into tm-dev...

Merge "Temp skip /product folder during root-hash calculation." into tm-dev am: 253e417e am: d1cdf070 am: 5f0e13dd am: f80b605e

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



Change-Id: I2347c3b539c356bdf14128f8c5066f568bd928cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>