Merge "uwb(hal): Switch ANDROID GID to 0xC"