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

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

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

Change-Id: I1a017d31c86b082b0d866aa2bf05661ea94bdcae