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

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



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