Bluetooth 5 PHY simplification am: a51513747a
am: ed6ce8637b

Change-Id: I336f047a649f5ff89c35ce5f69a0916b27ed0df5