Merge "Workaround for delayed reset-transform transaction" into rvc-dev am: 580111f2a1

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

Change-Id: I02954c90a316f45f28753d302a990fb67c86738f