Merge changes from topic "pts_bot_sysprop" into main am: cd13b8e2 am: 9b4eb3e9

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



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