[automerger skipped] Merge "ErrorProne: DatabaseManager" am: 449a7949 -s...

[automerger skipped] Merge "ErrorProne: DatabaseManager" am: 449a7949 -s ours am: 215ea92b -s ours

am skip reason: Merged-In I848452e9b1c03b08ee55c35ff286a3080b32ee73 with SHA-1 041e53cd is already in history

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



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