Merge "Fix image resizing" into udc-dev am: cdab1b87

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



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