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

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



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