[automerger skipped] Merge "Fix a potential NPE when allocating space for...

[automerger skipped] Merge "Fix a potential NPE when allocating space for compressed apex" into sc-dev am: 607cadc9 am: 314687f8 -s ours am: 807a545d -s ours

am skip reason: Merged-In I9357be8021e77fc8c3839f15a4a53c2a3c63cb13 with SHA-1 8ff9d439 is already in history

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

Change-Id: I4680b9d97ebd0bd06885921afc3305a10fb6efb7