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

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

Change-Id: Ied8115c072d10c796274ee786c29d3818928d433