[automerger skipped] Merge "Only add commit callback when using sync transaction" into sc-v2-dev am: 3316c977 am: 3c5d7286 -s ours

am skip reason: Merged-In Ib7345f2581b6e4ce8923531aebcd457c14d86027 with SHA-1 f2dace7b is already in history

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

Change-Id: I79410e618181f88fdadb540f4a961fbc259a0efe