[automerger skipped] Merge "Replace BTM_DEF_LOCAL_NAME with the new stable...

[automerger skipped] Merge "Replace BTM_DEF_LOCAL_NAME with the new stable sysprop value" am: 9670532b am: 6bfb5560 -s ours

am skip reason: Merged-In I17ab38075d772b476127203a4cdbc05f0b4f8d4a with SHA-1 703ccba4 is already in history

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



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