Merge "Bluetooth 5 PHY simplification" am: a9acf9db97
am: d43127865b

Change-Id: I782c0ad038cd68c00b7dd5908c7975e79b672a04