Place non-mobile tethering upstream types first

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 32163131
Bug: 63282480

Change-Id: I1f992f9d7a92424b0f20b0948c7134409a38c897