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

Merge "[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: 43240da1 -s ours
am: 7f777f72 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1 8417a5c7 is in history

Change-Id: Ib7857cd40f0aa3d780b9b3cdc2456dc63e86f53c