Merge "Do position-update on current sync if sync active" into tm-qpr-dev am: 79d356cc

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



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