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: 30fa4950

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



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