Merge "Delete package directory when app is uninstalled."

import android.annotation.Nullable;

import android.annotation.UserIdInt;

import android.content.LocusId;

import android.os.FileUtils;

import android.text.TextUtils;

import android.util.ArrayMap;

    void onDestroy() {

        mEventStore.onDestroy();

        mConversationStore.onDestroy();

        FileUtils.deleteContentsAndDir(mPackageDataDir);

    }

}