Merge "Base SL4A+SL4A test" am: dbfcbbda am: 8ba52d6c am: 0a1a6dc1 am:...

Merge "Base SL4A+SL4A test" am: dbfcbbda am: 8ba52d6c am: 0a1a6dc1 am: c3186d82 am: 5bcd3e6f am: 818f1e41

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



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