Merge changes from topic "allow_switching_hid_and_hogp" into main am: 0243fff2 am: 754833b1

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



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