Merge "Fix null deref & update compress" into udc-dev am: 900174ef

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



Change-Id: I8086adf8fa0ebc64065b0a21f981498b3cf56959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>