Merge "Reduce unused initialization for ActivityManager tests"