Snap for 8204150 from 1648aa42 to tm-d1-release

        }

    }

    {

    // TODO(b/220095381): Due to boot time regression, we have omitted call to

    // createAppDirectoryForSupplementalData from here temporarily (unless it's for testing)

    if (uuid_ != nullptr && strcmp(uuid_, "TEST") == 0) {

        auto status = createAppDirectoryForSupplementalData(uuid, packageName, userId, appId,

                                                            previousAppId, seInfo, flags);

        if (!status.isOk()) {