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

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

Change-Id: I52a847df564461128029fa79bb8f95c51153d1d8