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

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

Change-Id: I290ac6201f00356249bada0b6ec91aa6ad4d8669