fix pre-upload due to migration

The old packages/app/Bluetooth/PREUPLOAD.cfg was no longer executed.
Merge it into the root cfg script
Test: NA

Change-Id: I32422aa95529212767dc49d05d384aace3442806

PREUPLOAD.cfg

@@ -9,5 +9,9 @@ rustfmt = true
 rustfmt = --config-path=rustfmt.toml
 
 [Hook Scripts]
-aosp_first = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} ".*$"
+checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
+                  -fw android/app/src/com/android/bluetooth/
+                      android/app/lib/mapapi/com/android/bluetooth/mapapi/
+                      android/app/tests/src/com/android/bluetooth/
+aosp_first = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} ${PREUPLOAD_FILES}
 yapf_hook = ./system/tools/scripts/yapf_checker.py

android/app/PREUPLOAD.cfg

-[Options]
-ignore_merged_commits = true
-
-[Builtin Hooks]
-clang_format = true
-
-[Hook Scripts]
-checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
-                  -fw src/com/android/bluetooth/
-                      lib/mapapi/com/android/bluetooth/mapapi/
-                      tests/src/com/android/bluetooth/
-aosp_first = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} ${PREUPLOAD_FILES}