Merge "Move user file along to the new package name" into tm-dev am: 9b9c2bcc am: 28532d64 am: 490b4003 am: fd31e6bd

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



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