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

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

Change-Id: I8e81015abf310323e406c70a03fa41dd65e2ced2