Merge "[automerger skipped] Fix NullPointerException on addErrorCode when...

Merge "[automerger skipped] Fix NullPointerException on addErrorCode when input is Invalid error code am: ad90e1bf am: c2cdb2c7 am: 17120a7c -s ours" into rvc-qpr-dev-plus-aosp am: de91259c -s ours

am skip reason: Change-Id I43b8415ab98b4cf6520c3240dc544a9f62730a4e with SHA-1 ad90e1bf is in history

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

Change-Id: I46905d5855f49eb320eb311254cd5f1b285915ff