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: Ic7428c392fbcb62470c15d7549be45e2cedb17f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>