[automerger skipped] Merge "Keep original bitmap's dimensions during...

[automerger skipped] Merge "Keep original bitmap's dimensions during processing." into 24D1-dev am: a7003db7 -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: Iba361b147c817143bf518f2b975425352a1db9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>