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

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

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



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