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

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

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