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

Change-Id: Id409daff4fdb72f3f42d34b7e3a9ea6db76c6265