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

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

Change-Id: I2dbb8d3e4ce19910700a718ec4546062a0dff770