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

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

Change-Id: Ifa2492061b8af20b38e7d11a002c22d5b14b1d10