merge in nyc-mr2-release history after reset to ceda4a98bcb08f311ba5744ee95e8754b3b5f219

core/tests/coretests/src/android/os/BinderThreadPriorityTest.java

diff --git a/core/tests/coretests/src/android/os/BinderThreadPriorityTest.java b/core/tests/coretests/src/android/os/BinderThreadPriorityTest.java
index 56e977c..7a4980a 100644
--- a/core/tests/coretests/src/android/os/BinderThreadPriorityTest.java
+++ b/core/tests/coretests/src/android/os/BinderThreadPriorityTest.java
@@ -109,7 +109,7 @@
     }
 
     public static String expectedSchedulerGroup(int prio) {
-        return "/";
+        return prio < Process.THREAD_PRIORITY_BACKGROUND ? "/" : "/bg_non_interactive";
     }
 
     public void testPassPriorityToService() throws Exception {