Merge "Update the advertising_event_properties to match the definition" into...

Merge "Update the advertising_event_properties to match the definition" into main am: 811f3370 am: 79581335

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



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