[automerger skipped] Merge changes from topic "bt-remote-features" into tm-dev...

[automerger skipped] Merge changes from topic "bt-remote-features" into tm-dev am: 156866ef am: e2f0f613 -s ours am: b2e95476 -s ours

am skip reason: Merged-In I77f5e61be5162e6539b47823512f4537fedec392 with SHA-1 11e16a0b is already in history

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



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