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

Merge "[automerger skipped] Merge "Invalidate buffers on transform change" into tm-qpr-dev am: 00a8c5bc -s ours am: d9e85543 -s ours" into udc-dev-plus-aosp am: 97eab2c6 -s ours

am skip reason: Merged-In Ib4eef40a0f59512c669b069532e55d36293f9e1c with SHA-1 5545b1cc is already in history

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



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