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

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



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