[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 -s ours am: b26ceedf -s ours am: e7a852a6 -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: Ifc631a9c7b9c30349e8962bfcfe8a1cd66887dfe