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: Ib49c7df6251ba33f0806a792b4592ba63b267592