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

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

Change-Id: Icef15f7a7485e897b2f62a3566530e5376f19504