Merge "Merge "Create privapp permission grant file for TZ updater" am: 78d2038ca0 am: e3df642295 am: 20da56b8ce"