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

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

Change-Id: I201a7900db5c7c43eca00464301830e37111265e