Merge "[AWARE] Relocate ranging field in legacy HAL - match in HIDL impl"