Merge "Made privapp_permissions.py more dynamic."
am: fa565a60e0

Change-Id: I85e24c76135f0b8ab5625b2e02a5093979c375ac