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

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

Change-Id: Ia19e4bc608b97718bb61c474b091103412788545