Merge "Run liveSync/localSync.complete() earlier" into udc-qpr-dev am: 712fca51 am: bf81d071

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



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