Merge "fix argument to CloseGuard.open()" am: 33b2163412 am: fc42b88845

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

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