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

Change-Id: I2aed12f7984f14a01fef071c23282153931680aa