[automerger skipped] Merge "Fix isMetadataSynced_whenSynced_returnsTrue failure" into tm-qpr-dev am: d9f23095 -s ours am: b1abbe15 -s ours

am skip reason: Merged-In Ia888572203d9614f1f1ca6426a7c294638b77e75 with SHA-1 0810d380 is already in history

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



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