Merge "Add explicit clearSyncTransaction instead of passing in null" into udc-dev am: 187a18c497 am: dad088ec29

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

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