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

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

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