Merge "Add and update cross device sync data holders" into udc-dev am: ad2e7289cf am: 9739ef9d1b

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

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