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

Merge "Workaround for delayed reset-transform transaction" into rvc-dev am: 580111f2 am: 1fc42691 am: 133578b0 am: 70c29a16

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

Change-Id: I005742b85556f13be987760f30547b3ced6e65b4