Merge "Made privapp_permissions.py more dynamic." am: fa565a60e0 am: ea70408dd9
am: 6f7b04dbb2

Change-Id: Ia579c4a1d8390ff5b50967c92e988699117572c0