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 am: e16058c9

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

Change-Id: Ied2c94c8b724a6b02ad683c55b5ca6e88201a23d