Merge "Correct some errno values before throw ServiceSpecificException" am: ce0df5a6ed am: be5d9ca23e

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

Change-Id: Ia2b7a44212a015fdc3f9770a5f05a5b2fee2bd97