Merge "Only set SYNC flag if >1 track" into udc-qpr-dev am: 997f653a am: 4f8f9125

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



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