Merge "Fix segfault with sparse encoding" into sc-v2-dev am: 829f7d5ebf am: 9bd21329dd

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

Change-Id: I7545aecd7bdeff5f70294353591ea80f528f72b5