[automerger skipped] has: Add support for DATABASE_OUT_OF_SYNC am: 3de584ff...

[automerger skipped] has: Add support for DATABASE_OUT_OF_SYNC am: 3de584ff -s ours am: 115da135 -s ours

am skip reason: Merged-In Ieaa26a0b81549ab0136774dfc0935563e081f0a5 with SHA-1 d4956cca is already in history

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



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