Merge changes from topic "am-1026407531bf4c0fbb3e018988f04974-sc-dev" into sc-dev

* changes:
  Freeze netd_aidl_interface V7
  Show UID ranges config in dumpsys netd
  Support subsidiary priority on UID ranges

tests/binder_test.cpp

diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp
index e82285b..22d1f22 100644
--- a/tests/binder_test.cpp
+++ b/tests/binder_test.cpp
@@ -43,7 +43,6 @@
 #include <openssl/base64.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <sys/utsname.h>
 
 #include <android-base/file.h>
 #include <android-base/format.h>
@@ -1268,16 +1267,6 @@
 }  // namespace
 
 TEST_F(NetdBinderTest, IdletimerAddRemoveInterface) {
-    // TODO(b/175745224): Temporarily disable idletimer test on >5.10 kernels
-    utsname u;
-    if (!uname(&u)) {
-        unsigned long major, minor;
-        char *p;
-        major = strtoul(u.release, &p, 10);
-        minor = strtoul(++p, NULL, 10);
-        if (major > 5 || (major == 5 && minor >= 10)) return;
-    }
-
     // TODO: We will get error in if expectIdletimerInterfaceRuleNotExists if there are the same
     // rule in the table. Because we only check the result after calling remove function. We might
     // check the actual rule which is removed by our function (maybe compare the results between