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

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

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