Merge "Create privapp permission grant file for TZ updater"