Merge "Account for release callbacks when determing if sync is finished" into...

Merge "Account for release callbacks when determing if sync is finished" into tm-qpr-dev am: 4b383323

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



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