Merge "Merge "Workaround for delayed reset-transform transaction" into rvc-dev am: 580111f2 am: 1fc42691" into rvc-d1-dev-plus-aosp am: 8bfe6aa3

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

Change-Id: I4c82f1006251c14a51aed35173e61a1835e00331