Merge "Revert "Resync on the transaction."" into udc-dev am: b82218d2

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



Change-Id: Ib633084354a312920aa6e4974e0f1351e05bcb4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>