[automerger skipped] Check if the buffer is actually being scaled instead of only checking scaling mode am: b087db35 am: 1215460c am: a8bf68ad -s ours

am skip reason: skip tag Change-Id I90b05187a2e22834a99d3690095293fa37118734 with SHA-1 e7f79c51 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1652827

Change-Id: I8d97fb185611870717875e340f351359648aad72