Merge "Cleanup le scan parameters - continuation" into main am: 1f532b67 am: 5a176186

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



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