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

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



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