[automerger skipped] Merge "Modify player metadata sync checking logic" into...

[automerger skipped] Merge "Modify player metadata sync checking logic" into tm-dev am: 9a35057e am: 9c7d4d82 am: 108edead -s ours

am skip reason: Merged-In I2c3d664f64c7e2fa9c4761d5b45cacbcbd7da66b with SHA-1 b0c57563 is already in history

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



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