Merge "Sort local classic feature accessor" am: 69031266 am: 39d6a747

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



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