[automerger skipped] Rename wear property to be more homgenous am: eb51d334...

[automerger skipped] Rename wear property to be more homgenous am: eb51d334 am: 22252a1c -s ours

am skip reason: Merged-In I780ad411127abc274530885c37106c34edc35742 with SHA-1 eb51d334 is already in history

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



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