Merge changes from topics "apex_default_removal",...

Merge changes from topics "apex_default_removal", "include_bt_config_files_in_apex" into tm-dev am: 805393fe

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



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