Merge "Undo NAN periodic ranging changes in the legacy HAL and AIDL conversion method." into main