Merge "Fix test failure in ActivityManagerInternalTest"