Merge "SystemServer: Parametrized Flag testing" into main am: e863465d am:...

Merge "SystemServer: Parametrized Flag testing" into main am: e863465d am: 2bccd3d1 am: 247d00df

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



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