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

Change-Id: I7c2838d91e39b453002e5ce59346c0b59212d818