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

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



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