[automerger skipped] Added sync update database support am: 528e947e am:...

[automerger skipped] Added sync update database support am: 528e947e am: 6551339f am: 84be41fe -s ours am: 11b74372 -s ours

am skip reason: Merged-In I639a73a2213eb4a3030ce1398c441a552ab654cf with SHA-1 df8fdacf is already in history

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



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