Merge "[AWARE] Relocate ranging field in legacy HAL - match in HIDL impl"
am: 255cdb29a0

Change-Id: I2221282979fdf9b93495650fb82a0b8bfc9d4146