[automerger skipped] Added sync update database support am: 5b800bc2 am:...

[automerger skipped] Added sync update database support am: 5b800bc2 am: 12f66013 am: 947ddb8e -s ours

am skip reason: Merged-In Iad7999c10652839ba055fe798c4598f493fc566d with SHA-1 b4e29438 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2481123



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