Merge "Limit Carrier Privileges to relevant CTS test app" into emu-master-dev