Merge "btaa: undo btaa implementation is fluoride stack" am: e620cb12 am:...

Merge "btaa: undo btaa implementation is fluoride stack" am: e620cb12 am: 10623651 am: a129a58f

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1508037

Change-Id: Ia4269f5ebf9d4926dbe66129e47c177df7c3d63d