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

Change-Id: I19f653de3bed52faef13e7e08918e55abcad0c2f