[automerger skipped] Merge "Finish mocking in finally clause" into rvc-dev am:...

[automerger skipped] Merge "Finish mocking in finally clause" into rvc-dev am: 5c5a6898 am: ccfafc2c -s ours am: b9685cf6 -s ours

am skip reason: Change-Id I95cc24e789c5af5f655c875314ed97f50121166c with SHA-1 cd8b0633 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11415059

Change-Id: Ic02c8106c4b17d8b42c0b1b2a67b852053d18c39