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: 68e4eaaf

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



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