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

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

Change-Id: I452cfe622b64421c4c88ce57675596b3b6d38fda