Merge "Merge "Workaround for delayed reset-transform transaction" into rvc-dev am: 580111f2 am: 1fc42691" into rvc-d1-dev-plus-aosp am: 8bfe6aa3 am: 417f15c4

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

Change-Id: Idb1559107f892a47230427e203271430c0cccd87