[automerger skipped] Merge "Do not delete the DB if the received document is...

[automerger skipped] Merge "Do not delete the DB if the received document is malformed/corrupt" am: 3263fd22 am: 0b25267d am: 921b8240 am: 6340dacb am: 7e55eb05 -s ours

am skip reason: Merged-In I4839a45f933092a9bd42d74564797bacfeac49c1 with SHA-1 f2ff2fc4 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2058847



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