Merge "Make supported event count based on max events and not max company id"...

Merge "Make supported event count based on max events and not max company id" into tm-dev am: 1c3bf58b

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



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