Merge changes from topic "conn-diags-skipped" am: 05752a5316

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

Change-Id: I8ba883ee8a92c6e6b74b555d1b89448a763af1b3