Merge "Bluetooth 5 move timeout parameter (1/2)" am: d9f2f67a5f am: 07d79aa3b0
am: acd3953ea1

Change-Id: Ic2c7bd33d558bb4e8cfff063c95f2fa137aeaae0