Merge "Convert migrateLegacyKeystoreToWifiBlobstore to an asynchronous method." into main