Merge "add MANAGE_CREDENTIALS appop"