[automerger skipped] Keep original bitmap's dimensions during processing. am: 1a6c5db1 -s ours

am skip reason: Merged-In I1a44225fd8ad251ad9c2bd55f31fec6217624a1c with SHA-1 0d8bbbde is already in history

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



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