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

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



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