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