Merge "Fix NPE of ActivityManagerInternalTest"