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

Merge "Workaround for delayed reset-transform transaction" into rvc-dev am: 580111f2 am: 5ef845c6 am: 361f362c

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

Change-Id: I600a2487c286023e6a585eba858574b6d9751bd1