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

Change-Id: I8ba8ebc238214879d6e4e53be32c2c7fb818b58b