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

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

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