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

Change-Id: I96d5b619e9835f4134094cecf09ccbf0958c1a5c