Merge "Fix handling of negative size request for Bitmaps in...

Merge "Fix handling of negative size request for Bitmaps in LocalImageResolver" into tm-dev am: 0c363694

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



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