Merge "Support multiple cleanup blocks in tryTest{}" am: 9ef188b6c1

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1906252

Change-Id: I2c5a8b7f1cd4a2e38e8915f7a639a0727375629e