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

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

Change-Id: Id08bb2a462de0463ee9d42091d4f33f95494ba87