Merge "ErrorProne: DatabaseManager" into stage-aosp-master am: baa9b26d am:...

Merge "ErrorProne: DatabaseManager" into stage-aosp-master am: baa9b26d am: 9dab62a9 am: 3e469606 am: 3265768e

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



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