Merge "Explicitly exclude com.android.server from docs"