Merge "Revert "OPP: Do not trimDatabase if ContentProvider doesn't exist""...

Merge "Revert "OPP: Do not trimDatabase if ContentProvider doesn't exist"" into tm-qpr-dev am: afe91857 am: aa733345

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22439003



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