Merge "Handle review feedback for android.hardware.bluetooth.ranging" into main