[automerger skipped] Merge "has: Add support for DATABASE_OUT_OF_SYNC" into...

[automerger skipped] Merge "has: Add support for DATABASE_OUT_OF_SYNC" into tm-qpr-dev am: 50865374 am: 48614510 -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: Id20fc8fcdf28405b466d729685ed6115bea5e7b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>