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

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

Change-Id: I1de693ecd681f9025712a7b5f96afa4015d88656