Merge "Use Netd new added/removed uid range methods"