Merge "main::shim Rename removing ::legacy" into main am: f573541f

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



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