[automerger skipped] Merge "Invalidate buffers on transform change" into...

[automerger skipped] Merge "Invalidate buffers on transform change" into tm-qpr-dev am: 00a8c5bc -s ours am: 1bdf6d26 -s ours am: d6528265 -s ours am: 2f65dd31 -s ours am: 909f50df -s ours

am skip reason: Merged-In Ib4eef40a0f59512c669b069532e55d36293f9e1c with SHA-1 61c64472 is already in history

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



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