Merge "Prevent LocalImageResolver from upscaling images" into tm-dev am: e02f9e39 am: ba1c2d3b

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



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