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

Change-Id: I99fe9af2de6d99ef5b3f63d7e878f64e00254f53