Merge changes from topics "remove_expectblocked", "rename_reason" am: 9f3857754d

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

Change-Id: I212134cb565038e4e77d2cc170cde2f902f3bb79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>