Merge "Merge "Temp skip /product folder during root-hash calculation." into...

Merge "Merge "Temp skip /product folder during root-hash calculation." into tm-dev am: 253e417e am: 30fa4950 am: 3adde5b6" into tm-qpr-dev-plus-aosp am: 1ac344a0

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



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