Merge "Add Link Key Type info to dumpsys" am: ab9aea47 am: 73267160 am:...

Merge "Add Link Key Type info to dumpsys" am: ab9aea47 am: 73267160 am: c1227b81 am: 44f617fb

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



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