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

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

Change-Id: Ia613c4608dbe81744bf720b0c53bae533e29e1a9