Merge "Add new flag for change default trackable adv number" into main am:...

Merge "Add new flag for change default trackable adv number" into main am: e2ff2b14 am: bbf8f8ff

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



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