Merge "Fix NPE when running ActivityManagerServiceTest"