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 am: 1e7d9962

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



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