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

Change-Id: Iee7d485461f5e02ab65ec9f7311e962deb603543