[automerger skipped] Merge "Fix the potential NPE when starting provisioning...

[automerger skipped] Merge "Fix the potential NPE when starting provisioning with FILS." into rvc-dev am: db6652aa am: 553ee0cf am: 85717bee -s ours

am skip reason: Change-Id I3c29c6ad95c23cea2b3f374fb9dc35a8f54a6427 with SHA-1 1eb4c9d5 is in history

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

Change-Id: I16c49504dd3f7646cf737267ae51c51f5b5c325d