Merge changes from topics "bt_migration_mainline_tm", "bt_qpr_cherry_pick"...

Merge changes from topics "bt_migration_mainline_tm", "bt_qpr_cherry_pick" into tm-qpr-dev am: 7f8e3f67

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



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