Merge "Explicitly check route type in NetworkDiagnostics" am: 1c2f79705f

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

Change-Id: I3ad62ce4b176c4fecfc100a2171a833d3c967c96