Merge "Reduce WTFs in SyncManager" into rvc-qpr-dev am: 16206cbc8f

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

Change-Id: I4cf7d0237fa4cf4105875dfca496a979966a02f8