[automerger skipped] Merge "Store BLE keys using the address from the...

[automerger skipped] Merge "Store BLE keys using the address from the ble_auth_cmpl_evt" into qt-dev am: 5ffd2f6f -s ours am: edb3f7f1 -s ours am: 121d4053 -s ours
am: 944bc08a -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1 9f78214f is in history

Change-Id: I4834bb65b9359af6a55df3dd5c1da68c116a332f