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: I98037ef693c42d17aea6cc36d0c4aef84b26f439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>