Merge "ActivityManagerService: UID frozen API should check permissions" into udc-dev