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

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



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