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

Change-Id: Ib143711fa9d4bf2822ed585a8aacc74fd658c727