Merge "Adjust the config order for different scenarios" am: 9ecd6eb0 am:...

Merge "Adjust the config order for different scenarios" am: 9ecd6eb0 am: 3c555e2a am: 160e234b

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



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