Merge "Revert "Revert "Unhide RouteInfo#getType and related fields""" am: 839cb2692e am: 899a350e40

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927438

Change-Id: Ia98395e53b403aca330542b8f5360452a36d1625