Merge "DO not throw exception for ERROR_NO_SUCH_SLOT error" am: 95336cf4fc am: d57116437b

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

Change-Id: If81c211cc91372e162283efac1b0ee65e91841e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>