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 am: de668cfb

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



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