Merge "Merge "Create privapp permission grant file for TZ updater" am: 78d2038c am: e3df6422 am: 20da56b8"