Merge "Move user file along to the new package name" into tm-dev am: 9b9c2bcc am: d0fe24b7

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



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