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: I3b1d99e8a283f24c5f9e5c62892fa6cbc0ea61f7