[automerger skipped] Merge "Add pixel scaling to ScreenDecorationUtils" into...

[automerger skipped] Merge "Add pixel scaling to ScreenDecorationUtils" into 24D1-dev am: 89bbc1b4 -s ours

am skip reason: Merged-In I3ce403510b3ca35970685fc97a4fbcedaeb79151 with SHA-1 1bd66245 is already in history

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



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