Merge "Fix two crash causes in Flattener related to hashing" into sc-dev am:...

Merge "Fix two crash causes in Flattener related to hashing" into sc-dev am: 9e8dd09f am: f7b2c198 am: 8d11f62f

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

Change-Id: If0db8e8803d6cf30e846e154797e8e45cbe818ec