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

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



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