Merge "Fix ActivityManagerGetConfigTests."