Merge "Move UidRange aidl declaration to system/netd" into nyc-dev