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

Change-Id: I5f75034690784dd06d54345e60107ab7049e4da7