Merge "Fix a potential NPE when allocating space for compressed apex" into sc-dev am: 607cadc9

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

Change-Id: I563527c95095f72be1a0a52050e216421520098a