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: I2bc307d251e4ce1b1474899a5e7a3632cac930f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>