Merge "Support disabled/log/enforce in ro.control_privapp_permissions"