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: 0ef0c848 am: 4988c5e7

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

Change-Id: I20afd9d3ede2095249662b6181467718f8e6ab9f