f7cc17fb7e
Also includes some cleanup for next release. Fixes https://github.com/dart-lang/sdk/issues/44842 TEST=pkg/vm_service/test/regress_44842_test.dart Change-Id: I250fac7c52d6d5344bd5c3ec1c143deaa97419d9 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/182369 Reviewed-by: Gary Roumanis <grouma@google.com>