[automerger skipped] ErrorProne: DatabaseManager am: cdabba09 -s ours am: 0a3c70cb -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: Ie8c2db34f2d247b543c882120c05a49f4462786d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>