Merge "Move Sync to base class" into main am: 2d5ec079 am: 8a41f540 am:...

Merge "Move Sync to base class" into main am: 2d5ec079 am: 8a41f540 am: 6dc934c6 am: 1155016e

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2779867



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