[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 -s ours am: 4477e07b -s ours am: 511fa0e0 -s ours

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

Change-Id: I400a3feb3b6f2fea5a5d8bc004d3064140517420