Merge "Lower the BLE connection supervision timeout to 5s." am: 3396f83fe1
am: d4845a0aab

Change-Id: I5cc8f38a917ee16d10c0e7cc475170de3bf5e7cb