[automerger skipped] Merge "Add system properties to config pairing UI" into tm-mainline-prod am: d060e539 -s ours

am skip reason: Merged-In I359dba7eae531053653caa69eaf0cd6353255833 with SHA-1 03eddc61 is already in history

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



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