Merge "Add android.hardware.uwb feature"